Merge from emacs--devo--0

author Miles Bader <miles@gnu.org>

Sat, 29 Dec 2007 02:51:57 +0000 (02:51 +0000)

committer Miles Bader <miles@gnu.org>

Sat, 29 Dec 2007 02:51:57 +0000 (02:51 +0000)
author Miles Bader <miles@gnu.org>
Sat, 29 Dec 2007 02:51:57 +0000 (02:51 +0000)
committer Miles Bader <miles@gnu.org>
Sat, 29 Dec 2007 02:51:57 +0000 (02:51 +0000)
diff --cc lisp/ChangeLog
Simple merge
diff --cc src/process.c
Simple merge
author	Miles Bader <miles@gnu.org>
	Sat, 29 Dec 2007 02:51:57 +0000 (02:51 +0000)
committer	Miles Bader <miles@gnu.org>
	Sat, 29 Dec 2007 02:51:57 +0000 (02:51 +0000)
		1	2
lisp/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/process.c	patch \|	diff1 \|	diff2 \|	blob \| history